merge trunk
authorKenichi Handa <handa@m17n.org>
Mon, 1 Nov 2010 07:53:08 +0000 (16:53 +0900)
committerKenichi Handa <handa@m17n.org>
Mon, 1 Nov 2010 07:53:08 +0000 (16:53 +0900)
commitff17644b0b922a4023b856008a0e1553c7ff0541
treef0adec23601552a3aa6d09d2ef58162530a62a30
parent575ef9068d2c7681368aced60ad0c86c6ea37847
parente9c298cd82858e7d6b4b144a02af54358e7fa1dc
merge trunk
lisp/ChangeLog
lisp/faces.el
src/ChangeLog
src/xterm.c